SparkN0de-git - /page/commit.mu

Micron Document

--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

| SparkN0de-git | SparkN0de |

Node / ReticulumProjects / Sideband.git / commits / 88010b7

Commit 88010b76fcdc5d4a839bcd475efc2cf6a336a397

󰉖 Browse tree at this commit

Parents : 4b3e3d9

Author : Mark Qvist <mark@unsigned.io>

Date : 2025-10-28T02:24:11+01:00

Updated build configuration

Changes

3 files changed, 21 insertions(+), 20 deletions(-)

M sbapp/Makefile +15 -15

M sbapp/buildozer.spec +5 -4

M sbapp/main.py +1 -1

Diff

diff --git a/sbapp/Makefile b/sbapp/Makefile

index 93a10fb5..943ac9d1 100644

--- a/sbapp/Makefile

+++ b/sbapp/Makefile

@@ -19,34 +19,34 @@ pacthfiles: patchsdl injectxml patchpycodec2

patchsdl:

# Pach USB HID behaviour

- cp patches/HIDDeviceUSB.java .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/build/bootstrap_builds/sdl2/jni/SDL/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java

- cp patches/HIDDeviceUSB.java .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/src/main/java/org/libsdl/app/HIDDeviceUSB.java

- cp patches/HIDDeviceUSB.java .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/jni/SDL/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java

+ cp patches/HIDDeviceUSB.java .buildozer/android/platform/build-arm64-v8a/build/bootstrap_builds/sdl2/jni/SDL/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java

+ cp patches/HIDDeviceUSB.java .buildozer/android/platform/build-arm64-v8a/dists/sideband/src/main/java/org/libsdl/app/HIDDeviceUSB.java

+ cp patches/HIDDeviceUSB.java .buildozer/android/platform/build-arm64-v8a/dists/sideband/jni/SDL/android-project/app/src/main/java/org/libsdl/app/HIDDeviceUSB.java

# Pach service loader

cp patches/PythonService.java .buildozer/android/platform/python-for-android/pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java

- cp patches/PythonService.java .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/build/bootstrap_builds/sdl2/src/main/java/org/kivy/android/PythonService.java

- cp patches/PythonService.java .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/src/main/java/org/kivy/android/PythonService.java

+ cp patches/PythonService.java .buildozer/android/platform/build-arm64-v8a/build/bootstrap_builds/sdl2/src/main/java/org/kivy/android/PythonService.java

+ cp patches/PythonService.java .buildozer/android/platform/build-arm64-v8a/dists/sideband/src/main/java/org/kivy/android/PythonService.java

patchpycodec2:

- patchelf --replace-needed libcodec2.so.1.2 libcodec2.so .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/_python_bundle__arm64-v8a/_python_bundle/site-packages/pycodec2/pycodec2.so

- patchelf --replace-needed libcodec2.so.1.2 libcodec2.so .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/_python_bundle__armeabi-v7a/_python_bundle/site-packages/pycodec2/pycodec2.so

+ patchelf --replace-needed libcodec2.so.1.2 libcodec2.so .buildozer/android/platform/build-arm64-v8a/dists/sideband/_python_bundle__arm64-v8a/_python_bundle/site-packages/pycodec2/pycodec2.so

+ # patchelf --replace-needed libcodec2.so.1.2 libcodec2.so .buildozer/android/platform/build-arm64-v8a/dists/sideband/_python_bundle__armeabi-v7a/_python_bundle/site-packages/pycodec2/pycodec2.so

injectxml:

# mkdir /home/markqvist/.local/lib/python3.11/site-packages/pythonforandroid/bootstraps/sdl2/build/src/main/xml

# Inject XML on arm64-v8a

- mkdir -p .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/src/main/res/xml

- mkdir -p .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/templates

- cp patches/device_filter.xml .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/src/main/res/xml/

- cp patches/file_paths.xml .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/src/main/res/xml/

- cp patches/AndroidManifest.tmpl.xml .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/templates/

- cp patches/p4a_build.py .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/build.py

+ mkdir -p .buildozer/android/platform/build-arm64-v8a/dists/sideband/src/main/res/xml

+ mkdir -p .buildozer/android/platform/build-arm64-v8a/dists/sideband/templates

+ cp patches/device_filter.xml .buildozer/android/platform/build-arm64-v8a/dists/sideband/src/main/res/xml/

+ cp patches/file_paths.xml .buildozer/android/platform/build-arm64-v8a/dists/sideband/src/main/res/xml/

+ cp patches/AndroidManifest.tmpl.xml .buildozer/android/platform/build-arm64-v8a/dists/sideband/templates/

+ cp patches/p4a_build.py .buildozer/android/platform/build-arm64-v8a/dists/sideband/build.py

debug:

buildozer android debug

prebake:

-ifneq (,$(wildcard .buildozer/android/platform/build-arm64-v8a_armeabi-v7a/dists/sideband/src/main/res/xml/device_filter.xml))

+ifneq (,$(wildcard .buildozer/android/platform/build-arm64-v8a/dists/sideband/src/main/res/xml/device_filter.xml))

@echo Device filter XML exists, skipping prebake

else

@(echo Prebaking build before patching files...)

@@ -87,7 +87,7 @@ version:

@(echo $$(python ./gv.py))

install:

- adb install bin/sideband-$$(python ./gv.py)-arm64-v8a_armeabi-v7a-release.apk

+ adb install bin/sideband-$$(python ./gv.py)-arm64-v8a-release.apk

console:

(adb logcat | grep "python\|sidebandservice")

diff --git a/sbapp/buildozer.spec b/sbapp/buildozer.spec

index f9706831..4c437e28 100644

--- a/sbapp/buildozer.spec

+++ b/sbapp/buildozer.spec

@@ -10,9 +10,9 @@ source.exclude_patterns = app_storage/*,venv/*,Makefile,./Makefil*,requirements,

version.regex = __version__ = ['"](.*)['"]

version.filename = %(source.dir)s/main.py

-android.numeric_version = 20250327

+android.numeric_version = 20251027

-requirements = kivy==2.3.0,libbz2,pillow==10.2.0,qrcode==7.3.1,usb4a,usbserial4a,able_recipe,libwebp,libogg,libopus,opusfile,numpy,cryptography,ffpyplayer,codec2,pycodec2,sh,pynacl,typing-extensions,mistune>=3.0.2,beautifulsoup4

+requirements = kivy==2.3.0,libbz2,sqlite3,pillow==10.2.0,qrcode==7.3.1,usb4a,usbserial4a,able_recipe,libwebp,libogg,libopus,opusfile,numpy,cryptography,ffpyplayer,codec2,pycodec2,sh,pynacl,typing-extensions,mistune>=3.0.2,beautifulsoup4

android.gradle_dependencies = com.android.support:support-compat:28.0.0

#android.enable_androidx = True

@@ -31,13 +31,14 @@ fullscreen = 0

android.permissions = INTERNET,POST_NOTIFICATIONS,WAKE_LOCK,FOREGROUND_SERVICE,CHANGE_WIFI_MULTICAST_STATE,BLUETOOTH_SCAN,BLUETOOTH_ADVERTISE,BLUETOOTH_CONNECT,ACCESS_NETWORK_STATE,ACCESS_FINE_LOCATION,ACCESS_COARSE_LOCATION,MANAGE_EXTERNAL_STORAGE,ACCESS_BACKGROUND_LOCATION,RECORD_AUDIO,REQUEST_IGNORE_BATTERY_OPTIMIZATIONS,FOREGROUND_SERVICE_CONNECTED_DEVICE

-android.api = 31

+android.api = 33

android.minapi = 24

android.ndk = 25b

android.skip_update = False

android.accept_sdk_license = True

android.release_artifact = apk

-android.archs = arm64-v8a,armeabi-v7a

+android.archs = arm64-v8a

+#android.archs = arm64-v8a,armeabi-v7a

#android.logcat_filters = *:S python:D

services = sidebandservice:services/sidebandservice.py:foreground

diff --git a/sbapp/main.py b/sbapp/main.py

index 46e7d0b7..187e99c7 100644

--- a/sbapp/main.py

+++ b/sbapp/main.py

@@ -1,6 +1,6 @@

__debug_build__ = False

__disable_shaders__ = False

-__version__ = "1.7.0"

+__version__ = "1.8.0"

__variant__ = ""

import sys

──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────